From: Jimi Xenidis <jimix@watson.ibm.com>
Date: Tue, 12 Sep 2006 14:53:46 +0000 (-0400)
Subject: [POWERPC][XEN] make sure put_domain() is called in case of allocate_rma() failuer
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~15658^2~71
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success//%22http:/www.example.com/cgi/success/?a=commitdiff_plain;h=582f42dffcad0469db9d5d0ca1e956f7f8239e3c;p=xen.git

[POWERPC][XEN] make sure put_domain() is called in case of allocate_rma() failuer

Signed-off-by: Jimi Xenidis <jimix@watson.ibm.com>
Signed-off-by: Hollis Blanchard <hollisb@us.ibm.com>
---

diff --git a/xen/arch/powerpc/dom0_ops.c b/xen/arch/powerpc/dom0_ops.c
index 059a2994f4..35d0e95581 100644
--- a/xen/arch/powerpc/dom0_ops.c
+++ b/xen/arch/powerpc/dom0_ops.c
@@ -98,15 +98,14 @@ long arch_do_domctl(struct xen_domctl *domctl,
         struct domain *d;
         unsigned int log = domctl->u.real_mode_area.log;
 
+        ret = -ESRCH;
         d = find_domain_by_id(domctl->domain);
-        if (d == NULL)
-            return -ESRCH;
-
-        if (!cpu_rma_valid(log))
-            return -EINVAL;
-
-        ret = allocate_rma(d, log - PAGE_SHIFT);
-        put_domain(d);
+        if (d != NULL) {
+            ret = -EINVAL;
+            if (cpu_rma_valid(log))
+                ret = allocate_rma(d, log - PAGE_SHIFT);
+            put_domain(d);
+        }
     }
     break;